…(on Sample Data) with ElasticSearch

…rrectly

…nto#20178

 - Merge Pull Request magento#20178 from p-bystritsky/magento2:ISSUE-16198
 - Merged commits:
   1. 3b4581c

One column was outside the columnset in this layout, for some reason.  Moving this so the grid shows the user's website name

…nto#20178

 - Merge Pull Request magento#20178 from p-bystritsky/magento2:ISSUE-16198
 - Merged commits:
   1. 3b4581c
   2. 979e552

 - Merge Pull Request magento#20183 from saphaljha/magento2:2.2-develop-PR-port-18888
 - Merged commits:
   1. 06443f9
   2. cb6ff7e
   3. 56a0f11
   4. 9c59356
   5. fd4dd39
   6. a26b9bd
   7. 30a6d5a

…stomer Group set to the Default customer group on the default website scope

…stomer Group set to the Default customer group on the default website scope

code formatting

Backwards compatibility fix

use JSON_HEX_TAG option for not breaking things

use new serializer instead of json_encode

use correct serializer in test

declare return type

use serializer

updated unit testing, now uses serializer

removed space

declare strict type

improved comment

Test new serializer

Test for greater than and lesser than symbol, required by JSON_HEX_TAG option

split comment for readability

Declare strict type on test

Use di to inject

cleanup curly brackets

code cleanup

removed empty phpdoc

Fix BC

…n current category

…product doesn't belong in the current category magento#20286

 - Merge Pull Request magento#20286 from GovindaSharma/magento2:2.2-develop-PR-port-19232
 - Merged commits:
   1. 0247fc3

…pr18

issus fixed magento#20158 Store switcher not aligned proper in tab view

…CSV magento#20098 magento#20329

 - Merge Pull Request magento#20329 from irajneeshgupta/magento2:2.2-develop-PR-port-20127
 - Merged commits:
   1. 40f64f9

…PR-port-16154

…n on order view admin area magento#20353

 - Merge Pull Request magento#20353 from maheshWebkul721/magento2:file-option-fixed
 - Merged commits:
   1. c0730dc

…aligned proper in tab view magento#20325

 - Merge Pull Request magento#20325 from shikhamis11/magento2:2.2-develop-PR-port-20160
 - Merged commits:
   1. f9a03d8
   2. 82ad1ca

…etail check box misaligned magento#20328

 - Merge Pull Request magento#20328 from GovindaSharma/magento2:2.2-develop-PR-port-20233
 - Merged commits:
   1. 6c5cba7

…rror when failing magento#20271

 - Merge Pull Request magento#20271 from quisse/magento2:2.2-develop-PR-port-16154
 - Merged commits:
   1. 7e3ea1b
   2. f72fb42
   3. dbb905c
   4. c3f4d5d
   5. 31bf4b2

TSG-CSL3] For 2.2 (pr18)

…etail check box misaligned magento#20328

…aligned proper in tab view magento#20325

…n on order view admin area magento#20353

…CSV magento#20098 magento#20329

…"@magentoDbIsolation" in some integration tests. magento#20298

…to#20185

…product doesn't belong in the current category magento#20286

…rror when failing magento#20271

…nto#20178

Accepted Public Pull Requests:
 - magento#20328: [Backport] Fix issue 20232 : Backend order credit card detail check box misaligned (by @GovindaSharma)
 - magento#20325: [Backport] issus fixed magento#20158 Store switcher not aligned proper in tab view (by @shikhamis11)
 - magento#20353: Fixed#20352: displaying html content for file type option on order view admin area (by @maheshWebkul721)
 - magento#20329: [Backport]  Product image failure when importing through CSV magento#20098 (by @irajneeshgupta)
 - magento#20298: ISSUE-20296: "@magentoDataIsolation" is used instead of "@magentoDbIsolation" in some integration tests. (by @p-bystritsky)
 - magento#20185: [Backport] Move website_name column into columnSet (by @mage2pratik)
 - magento#20286: [Backport] Don't return categoryId from registry if the product doesn't belong in the current category (by @GovindaSharma)
 - magento#20271: [Backport] Use the new json serializer which throws an error when failing (by @quisse)
 - magento#20183: 2.2 develop pr port 18888 (by @saphaljha)
 - magento#20178: magento#16198: Category image remain after deleted. (by @p-bystritsky)


Fixed GitHub Issues:
 - magento#20232: Backend order credit card detail check box misaligned (reported by @speedy008) has been fixed in magento#20328 by @GovindaSharma in 2.2-develop branch
   Related commits:
     1. 6c5cba7

 - magento#20158: Store switcher not aligned proper in tab view (reported by @cedarvinda) has been fixed in magento#20325 by @shikhamis11 in 2.2-develop branch
   Related commits:
     1. f9a03d8
     2. 82ad1ca

 - magento#20352: File type option value shows html content in admin order view. (reported by @maheshWebkul721) has been fixed in magento#20353 by @maheshWebkul721 in 2.2-develop branch
   Related commits:
     1. c0730dc

 - magento#20098: Product image failure when importing through CSV (reported by @flytomek) has been fixed in magento#20329 by @irajneeshgupta in 2.2-develop branch
   Related commits:
     1. 40f64f9

 - magento#20296: "@magentoDataIsolation" is used instead of "@magentoDbIsolation" in some integration tests. (reported by @p-bystritsky) has been fixed in magento#20298 by @p-bystritsky in 2.2-develop branch
   Related commits:
     1. de64b09

 - magento#17819: Wrong product url from getProductUrl when current category has not product object (reported by @OleksiiBulba) has been fixed in magento#20286 by @GovindaSharma in 2.2-develop branch
   Related commits:
     1. 0247fc3

 - magento#14937: Javascript error thrown from uiComponent 'notification_area' if messages are malformed (reported by @sylvainraye) has been fixed in magento#20271 by @quisse in 2.2-develop branch
   Related commits:
     1. 7e3ea1b
     2. f72fb42
     3. dbb905c
     4. c3f4d5d
     5. 31bf4b2

 - magento#18192: Backend issue : "ratings isn't  available" website wise (reported by @hardik-krish) has been fixed in magento#20183 by @saphaljha in 2.2-develop branch
   Related commits:
     1. 06443f9
     2. cb6ff7e
     3. 56a0f11
     4. 9c59356
     5. fd4dd39
     6. a26b9bd
     7. 30a6d5a

 - magento#16198: Category image remain after deleted (reported by @vincent2090311) has been fixed in magento#20178 by @p-bystritsky in 2.2-develop branch
   Related commits:
     1. 3b4581c
     2. 979e552